added Davids tests