Move observable into main class

- remove test

ping @zoeesilcock