Refactored new acceptanceTestTests into another file, so they are all in one place and fixed some problems with running JUnit tests
Added some more tests a little bit everywhere
Fixed problems running some of the JUnit tests