starting on tests - structure

at end of this, audit all methods to see if missing anything