Test fixes and merging master to 0.1.x

Modify to masterless testing and ability to test against foss.