Delete ReturnBlock class and then fix unit tests and JavaDoc