Added admin and updated tests