refactoring observable tests
better templates