Small bug fixes in new test