Refactor tests for neutron

Change-Id: I8b5e144778af4bd699967198e3417989444c2761