Adding in config and breaking down tests