Updated tests
Updated generalTest