Fixed some tests
Removed redundant information.