added tests back in