(WIP) Added unit tests