Use cleaner failure testing.
Cover empty methods.
Test clean up and better coverage