More inputs added to examples and test refactoring