Changed unit tests to logic tests