update of lab optional fields and code clean up.
Merge pull request #6 from thinkking/schematests

update of lab optional fields and code clean up.