Added TestKeys. Cleaned up a bit.