ported more tests to gospec