Added more special tests