Starting swig and cleaned up tests