simplified test and introduced edits