Update base_test
closing #59, #58, #57, #56