Clean up tests, add failing test

Title says it all :money_with_wings: