Adding more tests. Squash this later.