additional tests and fixes to allow them to pass