Working on unittests (incomplete, still fail a few)