Better testing, some renamed types