added tests for #404