lose superfluous fluff
update tests to match settings changes
progress on objective_handler tests