got rid of both the error and the fail. The fail was that I had an inactive activity assigned to a village. However no message was given so I should make sure the method/test for that is really working
updated tests. last message still very important though
Merge branch 'exp'