Updated tests

Updating test structure to prevent Travis failures