Massive rewrite and inclusion of testing standards
lots of changes