Re-include more tests