Refractored and added Observation type test