Undo intentional break from testing :(   (closes #59)