JBIDE-15765 - use layer+slot, added test case