Added more test cases to check for errors, test mac command, etc.