[WIP] - Added unit tests