Added scct and more tests