Updated tests to specs