working on testing
fixed broken tests related to server.inject and dependencies.
more better tests
merged testing from development