Made testing code complete, although bugs still full testing, and so some it is commented out right now