Added more assembly generation and fixed tests and test script