modularized tests, prepared for 1.2 spec
modularized tests, prepared for 1.2 spec