Add tests, add console app