Remove switch statements
test attribute module