Fix for last known problem with chunked test -- first fully functional version