tests returned to green
merged in sam's work