Finished up a few tests