39-various-tests-and-fixes