fixed some tests
test live
test passed
Merge branch 'master' into develop