Fixed unit tests that were broken due to updated API version