Fix argument in core tests
Moved some stuff to sh module and added more tests