Feature/cash 150

These tests all have the same issues as above. I am not going to comment on them all again but please fix them.