Issue 4 test updates