Fix support for develop
Moar tests
Use SHM again