More tautologies and uncomment unit tests