Enhanced unit tests, fixed class naming.