move classes related to test support to separate modules