Rewrote some tests, added application.yml file as example