Updated tests with numbering