tests merged into master:

commit 89b0fa03a41eba633bc384037a34ade084cf2063
Author: Noel Delgado <auhcsei@gmail.com>
Date:   Thu Apr 17 14:15:23 2014 -0500

    adding tests