Fix tests and another NPE from manics