Added fixes for test