Added class to input element to improve testability
WiP