remove resolving tests and move everything into AST for compartmentalisation