fixed broken test, cleaned up some code around config contracts.