Started working on tests; Doing some modifications to get rid of warnings.
I fixed some build issues -- this change may have to be reverted if it messes someone else up.