Moved test files around, added dependency on junit