Remove extra logging and cover remaining logging functions

This matches up with what RW actually has in terms of errors and then covers it in lovely testiness!