Still working on new testing code (unfinished)