[Issue #209][WIP] Fixed tests