Reparsed sofa.h and added additional tests.