Addressed code feedback and added additional tests.