Bug fixes
Tests for kernel/variables