Fixed observations and added testing