Changed test spec naming convention
Added tests