Minor refactoring and few more numbers to test