fixed unit and app tests.