add key_name to attribute
breaking up some of the complex tests
more test re-org
breaking down the method tests