Added test suite back in, tweaked exports