added tests again