Cleaned up some of the library enabling/disabling logic
Basic Library enabling tests pass now.