Added back unit tests and added fix for django template text