adjusted tests and checks