move tests to proper suite