updated junit testing