Tidied up tests for linux