Issue #1 - Write unit tests