Added observable asobservable
Cleanup
Added more tests