More test and fixed some property and variable names