Improves dao ; Updates tests ; Fixed issues with beans