Modified list to throw exceptions and added Unit Tests