Adding tests for attribute and variable types