Update, clean, debug, expand tests