re-added tests