Bug 1254 - increase UT coverage

- removed unused classes

Change-Id: I6ea1eb81ea1d31967fce82eb49ac051e3980dfed
Signed-off-by: Martin Bobak <mbobak@cisco.com>