fill out missing tests. fix Zero bug