Initial test fix