Cleaned up the code a bit

Added some tests to ensure that MEF is never used