Removed unnecessary underscores from properties
Fixed typo
Added more unit tests for best practice validation code