improved key structure, split up tests