Improved coupling and added test