test and documentation [MJ-453]