finishing implementing some tests