Changed import style and test names with layout