updated tests - all passing