Improved isLoaded method
Improved tests to use annotations