some changes to testing, simulation