renamed methods
added simple test templates
cleaned code