Add minor fixes and test boilerplate