Wrapped up a few final tests