Removed that silly sandbox stuff, better functional testing