More Test fixes and cleanup. Added compose func.