Compile in separate function
Update tests
Removed test base corpo
Streamline code