- Fixed a few tests

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
- Add more tests.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>