rm redundancy
proper unittests