Add a few more tests. Working!