fixed tests failing

Please merge my branch to master