Re #922 Implementing the latest requirements, adding test classes.