Cleanup unit tests

Please merge ASAP to avoid future conflicts