Added admin controller tests, fixed date_time_parsing_bug
merge spec