cleaned up config and test