Separate tests, rename application