Changed build order for tests