Can load test.asm directly

Some refactoring