try to make tests pass

**Please don't pull**, this doesn't work
#3