Expanded testing code, added script for it