Finished up tests