testing and added tests