implemented more tests