Adding comments and base test class