WIP started conversion of tests to bacon