Test cleaned up and improved