Clean up testing and add better tests for tag