tests++
fixed global vs local scoping of services
reduced test timeouts to make them a bit faster
refactoring
0.3.0