Moved count tests to the top
Changed array syntax to be more familiar