added more tests and fixed number parse