Minor formatting fix
Add rudimentary test-cases for core requirements