misc cvac/CmakeLists.txt changes and FileServerTest.py target file fix