fixed most of the position_ tests
fixed discretionary_ tests
small fixes