Added final tests - Buildable