Initial commit to add unit tests