Add unit tests for remaining methods
Remove semicolon