Cleanin up, testing ...