tests+fixes