Added new tests. Still need to be implemented.