added todo
added more/better mop searching tests