small changes to get ready for automated testing