fixed tests (explicitly calling functions we have now moved to constructors)