Finished up tests...at least, for what I could test