Add controller Tests, change admin controller