Refactor tests (WIP)
Merge remote-tracking branch 'origin/master'