replaced imports of junit.framework.Assert with org.junit.Assert
added domain plus minor code changes