[refactor][tests] application & specs! may have to come back to this though...