Updated junit test imports.
Added factory method pattern using static method.