scaling fixed in test, still needs to be done in actual classes
scaling fixed in test, still needs to be done in actual classes
merged