more tests and adding exclude keys feature