using Base.Test, some organizing