Bugfixes before testing

Minor bugs caught by the compiler and removal of some test scripts