MEDIUM / Added some unit tests