Improve asserts checking for decimal number
Change matchers used