kostas - tidying up tests and code (removing of redundant methods)