JIRA EV-5: Finished up unit testing.