Added more tests and new entities.

Signed-off-by: Ivan Fabijanovic <ivan-fabijanovic@live.com>