Fixed include directory in Library builds; fixed tests.