Added and cleaned up some micro-tests