Fixed incorrect assert messages
Added numberOf helper
A lot of changes