Cleaned up unused test classes.
Coding standards.
Additional test cases for error handling.