cleaned up tests & key