Fixed bugs post writing unit tests
Added bug fixes after writing unit test
Added fixes after writing unit tests
Added other unit tests for the rest of the interfaces