Unit tests MJ-525

Opening this for now so that I can get some feedback.