Added vs style comments and tests