Refactoring and add test

12 jobs for constant_support_pa in 12 minutes and 22 seconds (queued for 2 seconds)