moved tests to proper source set