Remove cruft and get a passing basic test