Update #15 - Updated tests to go along with extra cases