Format and refactor challege items views and tests