Added current data for fw tests, more work required