Dame and Springer added + Test classes