Fixed failing tests, Application to be fully tested TODO