Worked on tests and extensions