Issue #307 Updates test