Refactored tests big time. Not compiling. Saving for just now. To be worked further.