Moved Freddy's freaking JUnit tests to appropriate test folder (i.e. out of src and into test where they belong)