Testing

Working on making testing easier. Still need to do work on it; don't merge.