Added MOAR tests