updated tests to only include static data from file, refactored total_spec_count
basic refactoring
more refactoring