Replaced with phpunit stub
Fixed stupid eclipse crap
Finished ServiceFactory test 
Moved data to seperate files