+ finish main method to be entrypoint of app
+ fix tests and improve coverage