removed trivial test
moved preamble for readability