Rewrite tests a bit. Make sure they test behaviour more. Create
placeholders for spies.