Refactored the testing setup, use test.properties now, first 'functional' test