Fixed boilerplate tests