More basic functionality and micro-tests