Removed a load of useless logging code in tests
Fixed 2 non passing tests caused by simple mis-ordered attributes

Signed-off-by: Martin Evans <martindevans@gmail.com>