Minor updates
Refactored and updated conventions
Expanded test cases