Fixed complilation errors due to new errors
Attempt to move tests to where they belong