test changes and a bit of cleanup