Improved syntax and added test unit