Add fix server and test case. Moved fix traits to individual header
file.