Added framework for testing