unit tests fixes for 5.3