adding more unit tests + removed some other stuff