Develop

Fixed bashisms to comply with unit testing.