Using service catalog and added regression tests