Applied comments, and added base test class.