added test for static rp container and fixed some unused stuff