(Tests still in progress -but progressing ;p-)