added tests and modified pages