Fixed small thing on test clean up and error message.