Cleaned upp testing scripts and wrappers