Updated example config, added more tests