Added initial test coverage