fixes to remove test code