Working on tests (haha)

1070