Adding test files and working on services