Adding unit tests for verification