Fixed tests
Updated to conform with testing comp. standards