Moved old code to Custom tests