Refactor NumberTests