rearranged the testing to make them work in parallell