cleaned up remaining 5.3 incompatibilities and errors in unit tests