Added updated build/tests