Added some unit tests
Instruction coverage: 87%