Finished up remaining tests