PCT-562 Fixed instance manager and new test