Started work on testing