Added test and support for static imports