changed build/test structure