Updated some testing, removed some unused old code.