Add mass test. Also improves launcher script