Tests passing; added more