Removing common functions, will not run without libraries; will replace with universal test