Added test keys, minor fixes