clean up source a bit
fix keys in test (were too long)