More traits cleanup

Combined the non member tests, relates #85