Minor build changes
Some testing and code doc