Working tests

This should make tests pass more.