fixes to tests now pass