Minor updates
Updated conventions
Expanded test cases