tests - finished separating modules