Make tests pass, remove blank specs