Did some unit tests for Cygnet maker