Fixed comments and reverted back to base test;