fixes to pass tests