Added some properties
Added some test templates