Added unit tests for implementation & remove file support