Implemented Admin API & some test additions