make some changes to ease testing the boilerplate