Wrote a few more tests, removed unnecessary database colummns