Fixing up the keyspace schema test and doing a little cleanup