Slight clean-up; add attribute 1 test for method 1