Fixed non-compiling tests
Fixed non-compiling tests
Added sources to citations in test cases