Fixed unit test
Added attribute-based configuration