Initial commit, writing some more tests