updated number definition and added more tests