Added unittest and 1 system tests. Includes 1 bugfix to resolving a circular import and 1 bugfix where dms wasn't creating the topology correctly when the water was specified in different chains