Get test coverage up to 100%. Fix settings for other classes.