Change tests to reflect changes
Fix some small errors