Added some tests from earlier.