Fix App#launch and clean up tests

It's a wip! Be nice!