Update tests with some minor fixes