Added test environment and some tests