Added test.properties for build to work but need to refactor this code