State -> Allow delay to pick up on non-native specific commands.
Location -> Fix broken unit test