Daniel - Moving all functional-tests from src/main/java to src/test/java