added composite test + minor cleanup