Add more tests and add config template