Fixing up tests
Fixed up generating lib and test