Could not split it since I needed to put back main in your tests

#11