Tests mostly work [MJ-480]