Added some tests to help pass bugs.