Added unit tests for current functionality