New testing

Added working tests.