Fix incorrect settings
Remove test function
Merge pull request #246 from Smashman/dev

Fix incorrect settings