Adding more tests as I get new functionality in.