bugfix and added ASSUME
working on tests