Fixed class names
Updated tests with @uses annotation