More tests, refactored micro