Refactor tests
Be strict
Remove obsolete clear() formerly used when singleton