Making types consistent and made tests more strict