fixed 6 errors for the existing test and now all past
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade