Moved old code to custom tests