Changed testing structure for simplicity