Changed: Minor changes to the logging and what is tested