Redefined how I'm naming and working everything, refoactoring tests. This should have probably been my first thing to do...