Fixed process calls + refactored tests