Added namespaces, renamed some class names
Added missing unit tests